Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump log4j version. #1848

Merged
merged 1 commit into from
Jul 11, 2023
Merged

Bump log4j version. #1848

merged 1 commit into from
Jul 11, 2023

Conversation

Yury-Fridlyand
Copy link
Collaborator

Description

log4j was updated on upstream opensearch-project/OpenSearch#8307.

Issues Resolved

Fix build failures caused by referencing different log4j versions.

Could not determine the dependencies of task ':opensearch-sql-plugin:thirdPartyAudit'.
> Could not resolve all dependencies for configuration ':opensearch-sql-plugin:runtimeClasspath'.
   > Conflict(s) found for the following module(s):
       - org.apache.logging.log4j:log4j-api between versions 2.20.0 and 2.17.1
       - org.apache.logging.log4j:log4j-core between versions 2.20.0 and 2.17.1
     Run with:
         --scan or
         :opensearch-sql-plugin:dependencyInsight --configuration runtimeClasspath --dependency org.apache.logging.log4j:log4j-api
     to get more insight on how to solve the conflict.

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@Yury-Fridlyand
Bump log4j version.
3f5812a 
Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
@codecov
Copy link

codecov bot commented Jul 11, 2023

Codecov Report

Merging #1848 (3f5812a) into main (4178c03) will increase coverage by 0.04%.
The diff coverage is 99.55%.

@@             Coverage Diff              @@
##               main    #1848      +/-   ##
============================================
+ Coverage     97.34%   97.39%   +0.04%     
- Complexity     4521     4600      +79     
============================================
  Files           394      401       +7     
  Lines         11159    11381     +222     
  Branches        810      843      +33     
============================================
+ Hits          10863    11084     +221     
- Misses          289      290       +1     
  Partials          7        7
Flag Coverage Δ
sql-engine 97.39% <99.55%> (+0.04%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...earch/sql/spark/data/constants/SparkConstants.java 0.00% <0.00%> (ø)
...org/opensearch/sql/spark/client/EmrClientImpl.java 100.00% <100.00%> (ø)
...esponse/DefaultSparkSqlFunctionResponseHandle.java 100.00% <100.00%> (ø)
...nctions/scan/SparkSqlFunctionTableScanBuilder.java 100.00% <100.00%> (ø)
...ctions/scan/SparkSqlFunctionTableScanOperator.java 100.00% <100.00%> (ø)
...a/org/opensearch/sql/spark/helper/FlintHelper.java 100.00% <100.00%> (ø)
...g/opensearch/sql/spark/response/SparkResponse.java 100.00% <100.00%> (ø)
...va/org/opensearch/sql/spark/storage/SparkScan.java 100.00% <100.00%> (ø)
...nsearch/sql/spark/storage/SparkStorageFactory.java 100.00% <100.00%> (ø)
...a/org/opensearch/sql/spark/storage/SparkTable.java 100.00% <100.00%> (ø)

@Yury-Fridlyand Yury-Fridlyand merged commit f5031a7 into opensearch-project:main Jul 11, 2023
@Yury-Fridlyand Yury-Fridlyand deleted the update-log4j branch July 11, 2023 19:40
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 11, 2023
@Yury-Fridlyand @github-actions
Bump log4j version. (#1848)
62f419d 
Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
(cherry picked from commit f5031a7)
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Jul 11, 2023
Merged
matthewryanwells pushed a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Jul 11, 2023
@Yury-Fridlyand @matthewryanwells
Bump log4j version. (opensearch-project#1848)
1b3f28d 
Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
MitchellGale pushed a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Jul 11, 2023
@Yury-Fridlyand @MitchellGale
Bump log4j version. (opensearch-project#1848)
cc4f7cb 
Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
MitchellGale pushed a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Jul 11, 2023
@Yury-Fridlyand @MitchellGale
Bump log4j version. (opensearch-project#1848)
fa50f0b 
Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
MitchellGale pushed a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Jul 11, 2023
@Yury-Fridlyand @MitchellGale
Bump log4j version. (opensearch-project#1848)
51cf26d 
Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Jul 12, 2023
Closed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 12, 2023
@Yury-Fridlyand @github-actions
Bump log4j version. (#1848)
76d535d 
Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
(cherry picked from commit f5031a7)
MaxKsyunz pushed a commit that referenced this pull request Jul 12, 2023
@opensearch-trigger-bot @Yury-Fridlyand
Bump log4j version. (#1848) (#1850)
87e4ea9 
Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
(cherry picked from commit f5031a7)

Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com>
@Yury-Fridlyand Yury-Fridlyand mentioned this pull request Jul 12, 2023
Merged
MitchellGale pushed a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Jul 20, 2023
@Yury-Fridlyand @MitchellGale
Bump log4j version. (opensearch-project#1848)
21bc4ae 
Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MaxKsyunz MaxKsyunz MaxKsyunz approved these changes

@forestmvey forestmvey forestmvey approved these changes

@GumpacG GumpacG GumpacG approved these changes

@pjfitzgibbons pjfitzgibbons Awaiting requested review from pjfitzgibbons

@ps48 ps48 Awaiting requested review from ps48 ps48 is a code owner

@kavithacm kavithacm Awaiting requested review from kavithacm kavithacm is a code owner

@derek-ho derek-ho Awaiting requested review from derek-ho derek-ho is a code owner

@joshuali925 joshuali925 Awaiting requested review from joshuali925 joshuali925 is a code owner

@dai-chen dai-chen Awaiting requested review from dai-chen dai-chen is a code owner

@YANG-DB YANG-DB Awaiting requested review from YANG-DB YANG-DB is a code owner

@rupal-bq rupal-bq Awaiting requested review from rupal-bq

@mengweieric mengweieric Awaiting requested review from mengweieric mengweieric is a code owner

@vmmusings vmmusings Awaiting requested review from vmmusings

@Swiddis Swiddis Awaiting requested review from Swiddis Swiddis is a code owner

@penghuo penghuo Awaiting requested review from penghuo penghuo is a code owner

@seankao-az seankao-az Awaiting requested review from seankao-az seankao-az is a code owner

@anirudha anirudha Awaiting requested review from anirudha anirudha is a code owner

@acarbonetto acarbonetto Awaiting requested review from acarbonetto acarbonetto is a code owner

Assignees
No one assigned
Labels
backport 2.x backport 2.9
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Yury-Fridlyand @GumpacG @forestmvey @MaxKsyunz